build: Drop Meson version checks
authorEmmanuele Bassi <ebassi@gnome.org>
Tue, 6 Dec 2022 21:15:48 +0000 (21:15 +0000)
committerEmmanuele Bassi <ebassi@gnome.org>
Tue, 6 Dec 2022 21:50:30 +0000 (21:50 +0000)
We depend on a new enough version of Meson.

gtk/meson.build
meson.build
testsuite/meson.build

index a75a4f23548b7eca2f579aa6f62f067f0d712abe..21540dd93ba64bd37d8f1e3c241ea0414703140f 100644 (file)
@@ -1147,8 +1147,6 @@ gtk_launch = executable(
 )
 gtk_tools += gtk_launch
 
-if meson.version().version_compare('>=0.54.0')
-  foreach tool: gtk_tools
-    meson.override_find_program(tool.name(), tool)
-  endforeach
-endif
+foreach tool: gtk_tools
+  meson.override_find_program(tool.name(), tool)
+endforeach
index 4ee93ee044d090d193e63fb0155c8af10ea5b639..a997efae533e6fdc0febf8eac5e57bc036331f7d 100644 (file)
@@ -1011,21 +1011,11 @@ subdir('docs/reference')
 install_data('m4macros/gtk-3.0.m4', install_dir: join_paths(get_option('datadir'), 'aclocal'))
 
 if not meson.is_cross_build()
-  if meson.version().version_compare('>=0.57.0')
-    gnome.post_install(
-      glib_compile_schemas: true,
-      gio_querymodules: gio_module_dirs,
-      gtk_update_icon_cache: get_option('demos'),
-    )
-  else
-    # Keep this in sync with post-install.py expected arguments
-    meson.add_install_script('build-aux/meson/post-install.py',
-                             gtk_api_version,
-                             gtk_binary_version,
-                             join_paths(gtk_prefix, get_option('bindir')),
-                             gtk_libdir,
-                             gtk_datadir)
-  endif
+  gnome.post_install(
+    glib_compile_schemas: true,
+    gio_querymodules: gio_module_dirs,
+    gtk_update_icon_cache: get_option('demos'),
+  )
 else
   message('Not executing post-install steps automatically when cross compiling')
 endif
index 032baf2979cc54aa9574f07989c49fb062764e8c..42f059095c1841ad28292f8391917e77d0b1b22c 100644 (file)
@@ -2,12 +2,10 @@ gtk_libexecdir = join_paths(gtk_prefix, get_option('libexecdir'))
 installed_test_bindir = join_paths(gtk_libexecdir, 'installed-tests', 'gtk+')
 installed_test_datadir = join_paths(gtk_datadir, 'installed-tests', 'gtk+')
 
-if meson.version().version_compare('>=0.57.0')
-  add_test_setup('default',
-    is_default: true,
-    exclude_suites: ['flaky', 'failing'],
-  )
-endif
+add_test_setup('default',
+  is_default: true,
+  exclude_suites: ['flaky', 'failing'],
+)
 
 subdir('gtk')
 subdir('gdk')